Remove di support, replace it with ServiceManager.