Move required services to ServiceManager