Container_2.0

improve of the container