Added support for Service Extensions