Updated base classes