Index: TECH/Persistent/Saver.cls.xml
===================================================================
diff -u
--- TECH/Persistent/Saver.cls.xml	(revision 0)
+++ TECH/Persistent/Saver.cls.xml	(revision 1382)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Persistent.Saver">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="Save">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Object:TECH.Persistent</FormalSpec>
+<Implementation><![CDATA[
+	do Object.Validate()
+	
+	#dim Status As %Status = Object.%Save()
+	If ($$$ISERR(Status))	{
+		If ($$ParseStatus^vhLib(Status) [ "TECH.ExceptionHandler") Do ##class(TECH.ExceptionHandler).Rethrow()
+		set Exception = ##class(TECH.Exceptions.SaveFailedException).%New("Kon object van type "_Object.%ClassName(1)_" niet opslaan",Status)
+		do Exception.VoegToeExtraInfo($get(%objlasterror))
+		do ##class(TECH.ExceptionHandler).Throw(Exception)
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/Persistent.cls.xml
===================================================================
diff -u -r548 -r1382
--- TECH/Persistent.cls.xml	(.../Persistent.cls.xml)	(revision 548)
+++ TECH/Persistent.cls.xml	(.../Persistent.cls.xml)	(revision 1382)
@@ -5,21 +5,11 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%Persistent,TECH.IPersistent</Super>
 
-<Parameter name="ErrorBijOnDelete">
-<Default>Error_bij_OnDelete</Default>
-</Parameter>
-
 <Method name="OpenId">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Id:%String</FormalSpec>
 <ReturnType>%ObjectHandle</ReturnType>
-<Implementation><![CDATA[
-	Set Object = ..%OpenId(Id)
-	If ('$IsObject(Object))
-	{
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).ObjectExpected(),"Kon object van type "_..%ClassName(1)_" niet openen met id "_Id))
-	}
-	Quit Object
+<Implementation><![CDATA[	quit ##class(TECH.Persistent.Opener).OpenId(..%ClassName(1),Id)
 ]]></Implementation>
 </Method>
 
@@ -30,19 +20,11 @@
 </Method>
 
 <Method name="Save">
-<Implementation><![CDATA[
-	do ..Validate()
-	
-	#dim Status As %Status = ..%Save()
-	If ($$$ISERR(Status))	{
-		If ($$ParseStatus^vhLib(Status) [ "TECH.ExceptionHandler") Do ##class(TECH.ExceptionHandler).Rethrow()
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.SaveFailedException).%New("Kon object van type "_..%ClassName(1)_" niet opslaan",Status))
-	}
+<Implementation><![CDATA[	do ##class(TECH.Persistent.Saver).Save($this)
 ]]></Implementation>
 </Method>
 
 <Method name="Validate">
-<Private>1</Private>
 </Method>
 
 <Method name="OnDelete">
@@ -64,39 +46,16 @@
 <Method name="DeleteId">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Id:%String</FormalSpec>
-<Implementation><![CDATA[
-	#dim Status As %Status = ..%DeleteId(Id)
-	If ($$$ISERR(Status))
-	{
-		If Status=$$$ERROR($$$GeneralError,..#ErrorBijOnDelete) {
-			Do ##class(TECH.ExceptionHandler).Rethrow()
-		}
-		Else {
-			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon object van type "_..%ClassName(1)_" met id "_Id_" niet verwijderen",Status))
-		}
-	}
+<Implementation><![CDATA[	do ##class(TECH.Persistent.Deleter).DeleteId(..%ClassName(1),Id)
 ]]></Implementation>
 </Method>
 
 <Method name="%OnDelete">
-<Description>
-[Previously private]</Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>oid:%ObjectIdentity</FormalSpec>
+<Private>1</Private>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	#dim Status=$$$OK
-	Set Object = ..%Open(oid)
-	If ($IsObject(Object))
-	{
-		Try {
-			Do Object.OnDelete()
-		}
-		Catch e {
-			Set Status=$$$ERROR($$$GeneralError,..#ErrorBijOnDelete)
-		}
-	}
-	Quit Status
+<Implementation><![CDATA[	quit ##class(TECH.Persistent.Deleter).OnDelete(..%ClassName(1),oid)
 ]]></Implementation>
 </Method>
 
Index: TECH/Persistent/Opener.cls.xml
===================================================================
diff -u
--- TECH/Persistent/Opener.cls.xml	(revision 0)
+++ TECH/Persistent/Opener.cls.xml	(revision 1382)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Persistent.Opener">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="OpenId">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ClassName:%String,Id:%String</FormalSpec>
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[
+	#dim Object As TECH.Persistent = $classMethod(ClassName,"%OpenId",Id)
+	if ('$IsObject(Object)) {
+		set Exception = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).ObjectExpected(),"Kon object van type "_ClassName_" niet openen met id "_Id)
+		do Exception.VoegToeExtraInfo($$$LCVT($get(%objlasterror)))
+		do ##class(TECH.ExceptionHandler).Throw(Exception)
+	}
+	quit Object
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/Persistent/Deleter.cls.xml
===================================================================
diff -u
--- TECH/Persistent/Deleter.cls.xml	(revision 0)
+++ TECH/Persistent/Deleter.cls.xml	(revision 1382)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Persistent.Deleter">
+<Super>TECH.RegisteredObject</Super>
+
+<Parameter name="ErrorBijOnDelete">
+<Default>Error_bij_OnDelete</Default>
+</Parameter>
+
+<Method name="DeleteId">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ClassName:%String,ID:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim Status As %Status = $classMethod(ClassName,"%DeleteId",ID)
+	If ($$$ISERR(Status)) {
+		If Status=$$$ERROR($$$GeneralError,..#ErrorBijOnDelete) {
+			do ##class(TECH.ExceptionHandler).Rethrow()
+		} Else {
+			set Exception = ##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon object van type "_..%ClassName(1)_" met id "_ID_" niet verwijderen",Status)
+			do Exception.VoegToeExtraInfo($get(%objlasterror))
+			do ##class(TECH.ExceptionHandler).Throw(Exception)
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="OnDelete">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ClassName:%String,oid:%ObjectIdentity</FormalSpec>
+<Implementation><![CDATA[
+	#dim Status = $$$OK
+	#dim Object As TECH.Persistent = $classMethod(ClassName,"%Open",oid)
+	If ($IsObject(Object)) {
+		Try {
+			do Object.OnDelete()
+		} Catch {
+			Set Status=$$$ERROR($$$GeneralError,..#ErrorBijOnDelete)
+		}
+	}
+	Quit Status
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>