Add support for services