Adding missing base classes