ENH: Added more to masking