Index: Tools/impl/JavaExport/KlasseNaamCollector.cls.xml
===================================================================
diff -u -r234 -r834
--- Tools/impl/JavaExport/KlasseNaamCollector.cls.xml	(.../KlasseNaamCollector.cls.xml)	(revision 234)
+++ Tools/impl/JavaExport/KlasseNaamCollector.cls.xml	(.../KlasseNaamCollector.cls.xml)	(revision 834)
@@ -143,12 +143,35 @@
 		Do ..Write(RedenVoorToevoeging,SchrijfNiveau)
 		Do ..TeExporterenKlassen.SetAt(Klasse,Klasse.Name)
 		Do ..ExporteerProperties(Klasse)
+		Do ..ZoekEnVoegToeDataTypes(Klasse,SchrijfNiveau)
 		Set IsToegevoegd = 1
 	}
 	Quit IsToegevoegd
 ]]></Implementation>
 </Method>
 
+<Method name="ZoekEnVoegToeDataTypes">
+<FormalSpec>Klasse:%Dictionary.CompiledClass,Schrijfniveau:%Integer</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	
+	#dim KlasseNaam As %String = Klasse.Name	
+	#dim Parameters As List of %Dictionary.CompiledParameter = Klasse.Parameters
+	Set ParameterIt = ##class(TECH.ListIterator).%New(Parameters)
+	While ParameterIt.HasNext()
+	{		
+		#dim Parameter As %Dictionary.CompiledParameter = ParameterIt.Next()
+		If Parameter.Name = "ELEMENTTYPE" {
+			#dim TeExporterenKlasseNaam As %String = ##class(TECH.ClassUtils).GetClassParameterValue(Klasse.Name,Parameter.Name)
+			If (##class(%Dictionary.CompiledClass).%ExistsId(TeExporterenKlasseNaam)){
+				#dim TeExporterenKlasse As %CompiledClass = ##class(%Dictionary.CompiledClass).%OpenId(TeExporterenKlasseNaam)
+				Do ..ExporteerKlasse(TeExporterenKlasse,"Klasse "_TeExporterenKlasseNaam_" gevonden als datatype.",Schrijfniveau)
+			}
+		}	
+	}
+]]></Implementation>
+</Method>
+
 <Method name="ExporteerProperties">
 <FormalSpec>Klasse:%Dictionary.CompiledClass</FormalSpec>
 <Private>1</Private>
Index: Tools/CacheJavaExport.cls.xml
===================================================================
diff -u -r716 -r834
--- Tools/CacheJavaExport.cls.xml	(.../CacheJavaExport.cls.xml)	(revision 716)
+++ Tools/CacheJavaExport.cls.xml	(.../CacheJavaExport.cls.xml)	(revision 834)
@@ -8,7 +8,12 @@
 Do ##class(Tools.CacheJavaExport).Exporteer("APPS.PM.Specials.SpecialsEditorService")</Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlasseNaam:%String,BasisPad:%String=""</FormalSpec>
-<Implementation><![CDATA[	Do ##class(Tools.impl.JavaExport.Exporter).%New().Exporteer(KlasseNaam , BasisPad)
+<Implementation><![CDATA[
+	If ##class(TECH.StringUtils).StartsWith(KlasseNaam,"WS."){
+		Write !,"Kan geen services exporteren die in de Webservice laag zitten.",!
+	}Else{
+		Do ##class(Tools.impl.JavaExport.Exporter).%New().Exporteer(KlasseNaam , BasisPad)
+	}
 ]]></Implementation>
 </Method>
 </Class>