Add some base classes