refactoring, updating models and services