Improved the interface of the container.