diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 2fb6416..824dbf2 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -1863,7 +1863,10 @@
 	}
 }
 
-template PDU_L3_SGSN_MS tr_GMM_DET_REQ_MT(template BIT3 dtt := ?, template boolean power_off := ?) := {
+template PDU_L3_SGSN_MS tr_GMM_DET_REQ_MT(
+		template BIT3 dtt := *,
+		template BIT3 forceToStandby := ?,
+		template OCT1 cause := omit) := {
 	discriminator := '1000'B,
 	tiOrSkip := {
 		skipIndicator := '0000'B
@@ -1872,9 +1875,26 @@
 		gprs_mm := {
 			detachRequest_SGSN_MS := {
 				messageType := '00000101'B,
-				detachType := { dtt, bool2bit_tmpl(power_off) },
-				forceToStandby := ?,
-				gmmCause := *
+				detachType := { dtt, ? },
+				forceToStandby := { forceToStandby, '0'B },
+				gmmCause := {
+					elementIdentifier := '25'O,
+					causeValue := { cause }
+				}
+			}
+		}
+	}
+}
+
+template PDU_L3_MS_SGSN ts_GMM_DET_ACCEPT_MO := {
+	discriminator := '0000'B, /* overwritten */
+	tiOrSkip := {
+		skipIndicator := '0000'B
+	},
+	msgs := {
+		gprs_mm := {
+			detachAccept_MS_SGSN := {
+				messageType := '00000000'B
 			}
 		}
 	}