Changed the collection in the FuelHandler to a Dictionary type