Restructuring masking classes.