Fluent API was improved