diff --git a/message_server/psl_ms.go b/message_server/psl_ms.go
index abfac53..0aa2390 100644
--- a/message_server/psl_ms.go
+++ b/message_server/psl_ms.go
@@ -45,7 +45,8 @@ func collectGateBoxPSLState(world ecs.World, mapId int32, box *data_proto.GatedB
 		for _, button := range pslStorage.PslButtons {
 			btnUidMap[boxUid+"_"+button.Code] = memory.GetMapElementId(button.Common)
 		}
-		btnArr := []*ecs.Entry{mkx.PCB, mkx.POB, mkx.PAB}
+		btnArr := []*ecs.Entry{mkx.PCB, mkx.PCBPL, mkx.POB, mkx.POBPL, mkx.PAB, mkx.PABPL, mkx.WRZF, mkx.WRZFPL,
+			mkx.QKQR, mkx.QKQRPL, mkx.MPL, mkx.JXTCPL}
 		for _, btn := range btnArr {
 			if btn == nil {
 				continue
diff --git a/ts/simulation/wayside/memory/wayside_simulation.go b/ts/simulation/wayside/memory/wayside_simulation.go
index 3a0e86e..3fa068d 100644
--- a/ts/simulation/wayside/memory/wayside_simulation.go
+++ b/ts/simulation/wayside/memory/wayside_simulation.go
@@ -814,6 +814,10 @@ func buildAndRelateElectronicComponent(repo *proto.Repository, relayGi *data_pro
 							mkx.PobjId = relay.Id
 						} else if strings.Contains(relay.GetCode(), "PAB") || strings.Contains(relay.GetCode(), "PDB") {
 							mkx.PabjId = relay.Id
+						} else if strings.Contains(relay.GetCode(), "WRZF") {
+							mkx.WrzfjId = relay.Id
+						} else if strings.Contains(relay.GetCode(), "QKQR") {
+							mkx.QkqrjId = relay.Id
 						}
 					}
 				}
@@ -1214,11 +1218,29 @@ func fillProtoRepository(repo *proto.Repository, storage *data_proto.RtssGraphic
 			repo.Buttons = append(repo.Buttons, repoButton)
 			switch button.Code {
 			case "PCB":
-				mkx.PcbButtonId = repoButton.Id
+				mkx.PcbaId = repoButton.Id
+			case "PCBPL":
+				mkx.PcbplaId = repoButton.Id
 			case "POB":
-				mkx.PobButtonId = repoButton.Id
+				mkx.PobaId = repoButton.Id
+			case "POBPL":
+				mkx.PobplaId = repoButton.Id
 			case "PAB":
-				mkx.PabButtonId = repoButton.Id
+				mkx.PabaId = repoButton.Id
+			case "PABPL":
+				mkx.PabplaId = repoButton.Id
+			case "WRZF":
+				mkx.WrzfaId = repoButton.Id
+			case "WRZFPL":
+				mkx.WrzfplaId = repoButton.Id
+			case "QKQR":
+				mkx.QkqraId = repoButton.Id
+			case "QKQRPL":
+				mkx.QkqrplaId = repoButton.Id
+			case "MPL":
+				mkx.MplaId = repoButton.Id
+			case "JXTCPL":
+				mkx.JxtcplaId = repoButton.Id
 			}
 		}
 	}