Steven add some base classes