Added two main base classes