removed model manipulation, centralized all model access in Service