Added support for services and clients
Added support for services and clients