Refactoring oe.qmc