MOM-6 refactoring and stuff