Added facilities for managing services