Adding more base classes