Framework: Adding Mask class - Adjustments on Window class