Added a container class