DMOLibrary refactoring