Added base classes