Updated models with new fields