Added embedded containers