Added more base classes