Preserve containers for 'simple' mode