added support for Masks from Shapes