model changes to comply with services