Additional object handler changes