Added make_container_opt