add changes for fuel 5.0