Added masking for paths