Add container base classes