fixed all model and services