Updated for new model objects