Updated models with appropriate inverse relationships