Added more Container solution