changes to use class service