Allow to override service class. Remove duplications