rewrite to support Fuel Components