Some new validation and masks.