Edit ManagerFactory

merge