Change to fluent configuration
Change to fluent configuration