Do we need the container class?