Adding model-level validation