[Mason] refactoring