Added container hierarchy