Validation improvement