Updates to include various masking options.