Add facilities for fetching sub containers as separate queries