Added base classes for the API