Validation updated