Added support for service instances