Add, modify base classes