Mor refactoring