Added support for services and clients