Index: TECH/ClassInfo/ClassDefinition.cls.xml
===================================================================
diff -u -r1518 -r1520
--- TECH/ClassInfo/ClassDefinition.cls.xml	(.../ClassDefinition.cls.xml)	(revision 1518)
+++ TECH/ClassInfo/ClassDefinition.cls.xml	(.../ClassDefinition.cls.xml)	(revision 1520)
@@ -28,10 +28,48 @@
 
 <Method name="IsPersistent">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit "%Persistent" [ ..ClassDefinition.Super
+<Implementation><![CDATA[
+	Set IsPersistent = ..ClassDefinition.Super [ "%Persistent"
+	
+	If ('IsPersistent)
+	{
+		Set SuperKlassenIt = ##class(TECH.PiecesIterator).%New(..ClassDefinition.Super,",")
+		While ('IsPersistent) && (SuperKlassenIt.HasNext())
+		{
+			Set SuperKlasse = SuperKlassenIt.Next()
+			If ($Extract(SuperKlasse,1,1) '= "%")
+			{
+				Set IsPersistent = ..%New(..GeefQualifiedName(SuperKlasse,##this)).IsPersistent()
+			}
+		}
+	}
+	
+	Quit IsPersistent
 ]]></Implementation>
 </Method>
 
+<Method name="IsWebservice">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set IsWebservice = ..ClassDefinition.Super [ "%SOAP.WebService"
+
+	If ('IsWebservice)
+	{
+		Set SuperKlassenIt = ##class(TECH.PiecesIterator).%New(..ClassDefinition.Super,",")
+		While ('IsWebservice) && (SuperKlassenIt.HasNext())
+		{
+			Set SuperKlasse = SuperKlassenIt.Next()
+			If ($Extract(SuperKlasse,1,1) '= "%")
+			{
+				Set IsWebservice = ..%New(..GeefQualifiedName(SuperKlasse,##this)).IsWebservice()
+			}
+		}
+	}
+	
+	Quit IsWebservice
+]]></Implementation>
+</Method>
+
 <Method name="GeefNaam">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..ClassDefinition.Name