Add missing base classes