Changes to object_proxy