Moved the container class