Added/Changed base classes