Updated for model changes