added support for service types