diff --git a/modules/database/src/template/top/exampleApp/src/Makefile b/modules/database/src/template/top/exampleApp/src/Makefile
index 07504feac..cf9e8cd8f 100644
--- a/modules/database/src/template/top/exampleApp/src/Makefile
+++ b/modules/database/src/template/top/exampleApp/src/Makefile
@@ -9,7 +9,7 @@ include $(TOP)/configure/CONFIG
 #  ADD MACRO DEFINITIONS BELOW HERE
 
 # Use typed rset structure (see 3.16.1 release notes)
-USR_CPPFLAGS += -DUSE_TYPED_RSET
+USR_CPPFLAGS += -DUSE_TYPED_RSET -DUSE_TYPED_DSET
 
 # xxxRecord.h will be created from xxxRecord.dbd
 DBDINC += xxxRecord
diff --git a/modules/database/src/template/top/exampleApp/src/devXxxSoft.c b/modules/database/src/template/top/exampleApp/src/devXxxSoft.c
index b0348213e..f7befadc5 100644
--- a/modules/database/src/template/top/exampleApp/src/devXxxSoft.c
+++ b/modules/database/src/template/top/exampleApp/src/devXxxSoft.c
@@ -21,42 +21,30 @@
 #include "xxxRecord.h"
 #include "epicsExport.h"
 
+static long init_record(dbCommon *prec)
+{
+    struct xxxRecord *pxxx = (struct xxxRecord *) prec;
+
+    if (recGblInitConstantLink(&pxxx->inp, DBF_DOUBLE, &pxxx->val))
+         pxxx->udf = FALSE;
+
+    return 0;
+}
+
+static long read_xxx(struct xxxRecord *pxxx)
+{
+    long status = dbGetLink(&(pxxx->inp), DBF_DOUBLE, &(pxxx->val), 0, 0);
+
+     /* If get was successful VAL is now defined */
+    if (!status)
+        pxxx->udf = FALSE;
+
+    return 0;
+}
+
 /*Create the dset for devXxxSoft */
-static long init_record();
-static long read_xxx();
-struct {
-    long        number;
-    DEVSUPFUN   report;
-    DEVSUPFUN   init;
-    DEVSUPFUN   init_record;
-    DEVSUPFUN   get_ioint_info;
-    DEVSUPFUN   read_xxx;
-}devXxxSoft={
-    5,
-    NULL,
-    NULL,
-    init_record,
-    NULL,
+xxxdset devXxxSoft = {
+    { 5, NULL, NULL, init_record, NULL },
     read_xxx,
 };
-epicsExportAddress(dset,devXxxSoft);
-
-
-static long init_record(pxxx)
-    struct xxxRecord    *pxxx;
-{
-    if(recGblInitConstantLink(&pxxx->inp,DBF_DOUBLE,&pxxx->val))
-         pxxx->udf = FALSE;
-    return(0);
-}
-
-static long read_xxx(pxxx)
-    struct xxxRecord    *pxxx;
-{
-    long status;
-
-    status = dbGetLink(&(pxxx->inp),DBF_DOUBLE, &(pxxx->val),0,0);
-    /*If return was succesful then set undefined false*/
-    if(!status) pxxx->udf = FALSE;
-    return(0);
-}
+epicsExportAddress(dset, devXxxSoft);
diff --git a/modules/database/src/template/top/exampleApp/src/xxxRecord.c b/modules/database/src/template/top/exampleApp/src/xxxRecord.c
index bf8c79982..282c9744c 100644
--- a/modules/database/src/template/top/exampleApp/src/xxxRecord.c
+++ b/modules/database/src/template/top/exampleApp/src/xxxRecord.c
@@ -67,15 +67,6 @@ rset xxxRSET={
 };
 epicsExportAddress(rset,xxxRSET);
 
-typedef struct xxxset { /* xxx input dset */
-    long        number;
-    DEVSUPFUN   dev_report;
-    DEVSUPFUN   init;
-    DEVSUPFUN   init_record; /*returns: (-1,0)=>(failure,success)*/
-    DEVSUPFUN   get_ioint_info;
-    DEVSUPFUN   read_xxx;
-}xxxdset;
-
 static void checkAlarms(xxxRecord *prec);
 static void monitor(xxxRecord *prec);
 
@@ -92,13 +83,13 @@ static long init_record(struct dbCommon *pcommon, int pass)
         return(S_dev_noDSET);
     }
     /* must have read_xxx function defined */
-    if( (pdset->number < 5) || (pdset->read_xxx == NULL) ) {
+    if( (pdset->common.number < 5) || (pdset->read_xxx == NULL) ) {
         recGblRecordError(S_dev_missingSup,(void *)prec,"xxx: init_record");
         return(S_dev_missingSup);
     }
 
-    if( pdset->init_record ) {
-        if((status=(*pdset->init_record)(prec))) return(status);
+    if( pdset->common.init_record ) {
+        if((status=(*pdset->common.init_record)(pcommon))) return(status);
     }
     return(0);
 }
diff --git a/modules/database/src/template/top/exampleApp/src/xxxRecord.dbd b/modules/database/src/template/top/exampleApp/src/xxxRecord.dbd
index af9e01050..088f33f6d 100644
--- a/modules/database/src/template/top/exampleApp/src/xxxRecord.dbd
+++ b/modules/database/src/template/top/exampleApp/src/xxxRecord.dbd
@@ -3,120 +3,129 @@
 # SPDX-License-Identifier: EPICS
 
 recordtype(xxx) {
-	include "dbCommon.dbd" 
-	field(VAL,DBF_DOUBLE) {
-		prompt("Current EGU Value")
-                promptgroup("40 - Input")
-                asl(ASL0)
-		pp(TRUE)
-	}
-	field(INP,DBF_INLINK) {
-		prompt("Input Specification")
-                promptgroup("40 - Input")
-		special(SPC_NOMOD)
-		interest(1)
-	}
-	field(PREC,DBF_SHORT) {
-		prompt("Display Precision")
-                promptgroup("80 - Display")
-		interest(1)
-	}
-	field(EGU,DBF_STRING) {
-		prompt("Engineering Units")
-                promptgroup("80 - Display")
-		interest(1)
-		size(16)
-	}
-	field(HOPR,DBF_FLOAT) {
-		prompt("High Operating Range")
-                promptgroup("80 - Display")
-		interest(1)
-	}
-	field(LOPR,DBF_FLOAT) {
-		prompt("Low Operating Range")
-                promptgroup("80 - Display")
-		interest(1)
-	}
-	field(HIHI,DBF_FLOAT) {
-		prompt("Hihi Alarm Limit")
-                promptgroup("70 - Alarm")
-		pp(TRUE)
-		interest(1)
-	}
-	field(LOLO,DBF_FLOAT) {
-		prompt("Lolo Alarm Limit")
-                promptgroup("70 - Alarm")
-		pp(TRUE)
-		interest(1)
-	}
-	field(HIGH,DBF_FLOAT) {
-		prompt("High Alarm Limit")
-                promptgroup("70 - Alarm")
-		pp(TRUE)
-		interest(1)
-	}
-	field(LOW,DBF_FLOAT) {
-		prompt("Low Alarm Limit")
-                promptgroup("70 - Alarm")
-		pp(TRUE)
-		interest(1)
-	}
-	field(HHSV,DBF_MENU) {
-		prompt("Hihi Severity")
-                promptgroup("70 - Alarm")
-		pp(TRUE)
-		interest(1)
-		menu(menuAlarmSevr)
-	}
-	field(LLSV,DBF_MENU) {
-		prompt("Lolo Severity")
-                promptgroup("70 - Alarm")
-		pp(TRUE)
-		interest(1)
-		menu(menuAlarmSevr)
-	}
-	field(HSV,DBF_MENU) {
-		prompt("High Severity")
-                promptgroup("70 - Alarm")
-		pp(TRUE)
-		interest(1)
-		menu(menuAlarmSevr)
-	}
-	field(LSV,DBF_MENU) {
-		prompt("Low Severity")
-                promptgroup("70 - Alarm")
-		pp(TRUE)
-		interest(1)
-		menu(menuAlarmSevr)
-	}
-	field(HYST,DBF_DOUBLE) {
-		prompt("Alarm Deadband")
-                promptgroup("70 - Alarm")
-		interest(1)
-	}
-	field(ADEL,DBF_DOUBLE) {
-		prompt("Archive Deadband")
-                promptgroup("80 - Display")
-		interest(1)
-	}
-	field(MDEL,DBF_DOUBLE) {
-		prompt("Monitor Deadband")
-                promptgroup("80 - Display")
-		interest(1)
-	}
-	field(LALM,DBF_DOUBLE) {
-		prompt("Last Value Alarmed")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(ALST,DBF_DOUBLE) {
-		prompt("Last Value Archived")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(MLST,DBF_DOUBLE) {
-		prompt("Last Val Monitored")
-		special(SPC_NOMOD)
-		interest(3)
-	}
+    include "dbCommon.dbd"
+    %
+    %/* Declare Device Support Entry Table */
+    %struct xxxRecord;
+    %typedef struct xxxdset {
+    %    dset common;
+    %    long (*read_xxx)(struct xxxRecord *prec);
+    %} xxxdset;
+    %#define HAS_xxxdset
+    %
+    field(VAL,DBF_DOUBLE) {
+        prompt("Current EGU Value")
+        promptgroup("40 - Input")
+        asl(ASL0)
+        pp(TRUE)
+    }
+    field(INP,DBF_INLINK) {
+        prompt("Input Specification")
+        promptgroup("40 - Input")
+        special(SPC_NOMOD)
+        interest(1)
+    }
+    field(PREC,DBF_SHORT) {
+        prompt("Display Precision")
+        promptgroup("80 - Display")
+        interest(1)
+    }
+    field(EGU,DBF_STRING) {
+        prompt("Engineering Units")
+        promptgroup("80 - Display")
+        interest(1)
+        size(16)
+    }
+    field(HOPR,DBF_FLOAT) {
+        prompt("High Operating Range")
+        promptgroup("80 - Display")
+        interest(1)
+    }
+    field(LOPR,DBF_FLOAT) {
+        prompt("Low Operating Range")
+        promptgroup("80 - Display")
+        interest(1)
+    }
+    field(HIHI,DBF_FLOAT) {
+        prompt("Hihi Alarm Limit")
+        promptgroup("70 - Alarm")
+        pp(TRUE)
+        interest(1)
+    }
+    field(LOLO,DBF_FLOAT) {
+        prompt("Lolo Alarm Limit")
+        promptgroup("70 - Alarm")
+        pp(TRUE)
+        interest(1)
+    }
+    field(HIGH,DBF_FLOAT) {
+        prompt("High Alarm Limit")
+        promptgroup("70 - Alarm")
+        pp(TRUE)
+        interest(1)
+    }
+    field(LOW,DBF_FLOAT) {
+        prompt("Low Alarm Limit")
+        promptgroup("70 - Alarm")
+        pp(TRUE)
+        interest(1)
+    }
+    field(HHSV,DBF_MENU) {
+        prompt("Hihi Severity")
+        promptgroup("70 - Alarm")
+        pp(TRUE)
+        interest(1)
+        menu(menuAlarmSevr)
+    }
+    field(LLSV,DBF_MENU) {
+        prompt("Lolo Severity")
+        promptgroup("70 - Alarm")
+        pp(TRUE)
+        interest(1)
+        menu(menuAlarmSevr)
+    }
+    field(HSV,DBF_MENU) {
+        prompt("High Severity")
+        promptgroup("70 - Alarm")
+        pp(TRUE)
+        interest(1)
+        menu(menuAlarmSevr)
+    }
+    field(LSV,DBF_MENU) {
+        prompt("Low Severity")
+        promptgroup("70 - Alarm")
+        pp(TRUE)
+        interest(1)
+        menu(menuAlarmSevr)
+    }
+    field(HYST,DBF_DOUBLE) {
+        prompt("Alarm Deadband")
+        promptgroup("70 - Alarm")
+        interest(1)
+    }
+    field(ADEL,DBF_DOUBLE) {
+        prompt("Archive Deadband")
+        promptgroup("80 - Display")
+        interest(1)
+    }
+    field(MDEL,DBF_DOUBLE) {
+        prompt("Monitor Deadband")
+        promptgroup("80 - Display")
+        interest(1)
+    }
+    field(LALM,DBF_DOUBLE) {
+        prompt("Last Value Alarmed")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(ALST,DBF_DOUBLE) {
+        prompt("Last Value Archived")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(MLST,DBF_DOUBLE) {
+        prompt("Last Val Monitored")
+        special(SPC_NOMOD)
+        interest(3)
+    }
 }