more use of fluent api