updated base classes