added more base classes