Changes to ObjectHandler