Adding a few more base classes/features