Refactored Modular Fuel Tanks interface