Added support for container-less inventories