Made scheduler more aware of services