Added support for container hierarchies