Begin changes to support proxy models.