Updated models for validation