Add support for abstract service