Changed wrapper class to container.