Fixing shading
Adding support for label mask type