Better ObjectTree handling