Adding support for services