Index: TECH/PubSub/EventHandler.cls.xml
===================================================================
diff -u -r2552 -r2993
--- TECH/PubSub/EventHandler.cls.xml	(.../EventHandler.cls.xml)	(revision 2552)
+++ TECH/PubSub/EventHandler.cls.xml	(.../EventHandler.cls.xml)	(revision 2993)
@@ -14,8 +14,24 @@
 <Method name="Install">
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
-	Set Subscription = ##class(TECH.PubSub.EventSubscription).%New(..GetEventType(),..%ClassName(1),"StartVerwerking")
-	Do Subscription.Save()
+	#dim UsesParameters As %Boolean = $$$False
+	
+	set ClassDef = ##class(%Dictionary.ClassDefinition).%OpenId(..%ClassName(1),$$$ConcurrenyNoLocks)
+	set ParamDefIterator = ##class(TECH.ListIterator).%New(ClassDef.Parameters)
+	while ParamDefIterator.HasNext() {
+		#dim ParamDef As %Dictionary.ParameterDefinition = ParamDefIterator.Next()
+		continue:'$$$StartsWith(ParamDef.Name,"EventType")
+		
+		Set Subscription = ##class(TECH.PubSub.EventSubscription).%New(ParamDef.Default,..%ClassName(1),"StartVerwerking")
+		Do Subscription.Save()
+		
+		set UsesParameters = $$$True
+	}
+	
+	if $$$Not(UsesParameters) {
+		Set Subscription = ##class(TECH.PubSub.EventSubscription).%New(..GetEventType(),..%ClassName(1),"StartVerwerking")
+		Do Subscription.Save()
+	}
 ]]></Implementation>
 </Method>
 
@@ -24,7 +40,7 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	set MethodDefinition = ##class(%Dictionary.MethodDefinition).%OpenId(..%ClassName(1)_"||StartVerwerking")
+	set MethodDefinition = ##class(%Dictionary.MethodDefinition).%OpenId(..%ClassName(1)_"||StartVerwerking",$$$ConcurrenyNoLocks)
 	quit $classmethod($piece(MethodDefinition.FormalSpec,":",2),"Type")
 ]]></Implementation>
 </Method>