update to use the Fluid fluent api