Adding the base classes