Validation improvements