Added Fluent API changes