Added possibility to disable the service