I have a 2520, and I use a Type II safety can. The built-in nozzle is good for getting the diesel in the hole. The metal cans are a bit heavier to lift up over the hood, but I don't like poly fuel containers. But it's still real easy to over fill it because you can't see into the top of the tank as you pour. I tend to not fill it up completely, and just call it good enough.