Add base classes for common use cases