Update to contain superclasses