added enabled parameter,
improved service definition