changes to model service