Refactoring and manager started