Changed implementation of the container.