Updated model with required vars