Updated for object model changes