Added component masking