Improved the container data structure.