Updated to support new FUEL API