Issue 2093 make containers support multiple structures