Added object hierarchy