Add RG and CPF masks