Adding support for mask type