Service class updates