Removed mask factory and refactored into base class