Added some extra base classes