Update to use model objects.