Introduced switch to alow service to be managed by higher level module