Added base classes and helpers