Refactoring for new format of Mason.