fluent api + services reworked
fixed models and api