improve object hierarchy.