Refactoring of Mask class
Work in Progress