Refactoring for handling of all fuel
Merge