more services, model changes