Fixed to reflect model changes