Easier switching of container class