Add mask and unmask options for units