OP-421: No need for ServiceMixin class…