ENH:  Improving mask option interface