Fluent API Refactoring