Merit module refactor