Added more support for services