Rework owning hierarchy