Incorporate suggestions and ideas after fluent API review.