Adding masking functionality