Updated for model changes, utility improvements.