Added initial support for separation of dispatch by fuel