Updated with recent model changes