Validation improved