Minor implementation changes in the service directives