Change validation to use the same pattern from others