Validation chenges