Added support for service handlers