Added fluent configuration