diff --git a/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4733.map b/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4733.map
new file mode 100644
index 00000000..ef0b933b
--- /dev/null
+++ b/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4733.map
@@ -0,0 +1,96 @@
+Author: Andrew Rathbun
+Description: A member was removed from a security-enabled local group
+EventId: 4733
+Channel: Security
+Provider: Microsoft-Windows-Security-Auditing
+Maps:
+ -
+ Property: UserName
+ PropertyValue: "%domain%\\%user% (%sid%)"
+ Values:
+ -
+ Name: domain
+ Value: "/Event/EventData/Data[@Name=\"SubjectDomainName\"]"
+ -
+ Name: user
+ Value: "/Event/EventData/Data[@Name=\"SubjectUserName\"]"
+ -
+ Name: sid
+ Value: "/Event/EventData/Data[@Name=\"SubjectUserSid\"]"
+ -
+ Property: PayloadData1
+ PropertyValue: "Target: %TargetDomainName%\\%TargetUserName% (%TargetSid%)"
+ Values:
+ -
+ Name: TargetUserName
+ Value: "/Event/EventData/Data[@Name=\"TargetUserName\"]"
+ -
+ Name: TargetDomainName
+ Value: "/Event/EventData/Data[@Name=\"TargetDomainName\"]"
+ -
+ Name: TargetSid
+ Value: "/Event/EventData/Data[@Name=\"TargetSid\"]"
+ -
+ Property: PayloadData2
+ PropertyValue: "SubjectLogonId: %SubjectLogonId%"
+ Values:
+ -
+ Name: SubjectLogonId
+ Value: "/Event/EventData/Data[@Name=\"SubjectLogonId\"]"
+ -
+ Property: PayloadData3
+ PropertyValue: "MemberName: %MemberName%"
+ Values:
+ -
+ Name: MemberName
+ Value: "/Event/EventData/Data[@Name=\"MemberName\"]"
+ -
+ Property: PayloadData4
+ PropertyValue: "MemberSid: %MemberSid%"
+ Values:
+ -
+ Name: MemberSid
+ Value: "/Event/EventData/Data[@Name=\"MemberSid\"]"
+ -
+ Property: PayloadData5
+ PropertyValue: "PrivilegeList: %PrivilegeList%"
+ Values:
+ -
+ Name: PrivilegeList
+ Value: "/Event/EventData/Data[@Name=\"PrivilegeList\"]"
+
+# Documentation:
+# https://www.ultimatewindowssecurity.com/securitylog/encyclopedia/event.aspx?eventid=4733
+# https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4733
+#
+# Example Event Data:
+#
+#
+#
+# 4733
+# 0
+# 0
+# 13826
+# 0
+# 0x8020000000000000
+#
+# 175037
+#
+#
+# Security
+# DC01.contoso.local
+#
+#
+#
+# CN=Auditor,CN=Users,DC=contoso,DC=local
+# S-1-5-21-3457937927-2839227994-823803824-2104
+# AccountOperators
+# CONTOSO
+# S-1-5-21-3457937927-2839227994-823803824-6605
+# S-1-5-21-3457937927-2839227994-823803824-1104
+# dadmin
+# CONTOSO
+# 0x35e38
+# -
+#
+#
diff --git a/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4781.map b/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4781.map
new file mode 100644
index 00000000..ffd8002f
--- /dev/null
+++ b/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4781.map
@@ -0,0 +1,82 @@
+Author: Andrew Rathbun
+Description: The name of an account was changed
+EventId: 4781
+Channel: Security
+Provider: Microsoft-Windows-Security-Auditing
+Maps:
+ -
+ Property: UserName
+ PropertyValue: "%domain%\\%user% (%sid%)"
+ Values:
+ -
+ Name: domain
+ Value: "/Event/EventData/Data[@Name=\"SubjectDomainName\"]"
+ -
+ Name: user
+ Value: "/Event/EventData/Data[@Name=\"SubjectUserName\"]"
+ -
+ Name: sid
+ Value: "/Event/EventData/Data[@Name=\"SubjectUserSid\"]"
+ -
+ Property: PayloadData1
+ PropertyValue: "OldTargetUserName: %OldTargetUserName%"
+ Values:
+ -
+ Name: OldTargetUserName
+ Value: "/Event/EventData/Data[@Name=\"OldTargetUserName\"]"
+ -
+ Property: PayloadData2
+ PropertyValue: "NewTargetUserName: %NewTargetUserName%"
+ Values:
+ -
+ Name: NewTargetUserName
+ Value: "/Event/EventData/Data[@Name=\"NewTargetUserName\"]"
+ -
+ Property: PayloadData3
+ PropertyValue: "TargetDomainName: %TargetDomainName%"
+ Values:
+ -
+ Name: TargetDomainName
+ Value: "/Event/EventData/Data[@Name=\"TargetDomainName\"]"
+ -
+ Property: PayloadData4
+ PropertyValue: "TargetSid: %TargetSid%"
+ Values:
+ -
+ Name: TargetSid
+ Value: "/Event/EventData/Data[@Name=\"TargetSid\"]"
+
+# Documentation:
+# https://www.ultimatewindowssecurity.com/securitylog/encyclopedia/event.aspx?eventid=4781
+# https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4781
+#
+# Example Event Data:
+#
+#
+#
+# 4781
+# 0
+# 0
+# 13784
+# 0
+# 0x8020000000000000
+#
+# 210012591
+#
+#
+# Security
+# hostname
+#
+#
+#
+# Administrators
+# Administrators
+# Builtin
+# S-1-5-32-123
+# S-1-5-18
+# username
+# domain
+# 0x3E7
+# -
+#
+#
diff --git a/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4782.map b/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4782.map
new file mode 100644
index 00000000..59c0139f
--- /dev/null
+++ b/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4782.map
@@ -0,0 +1,69 @@
+Author: Andrew Rathbun
+Description: The password hash of an account was accessed
+EventId: 4782
+Channel: Security
+Provider: Microsoft-Windows-Security-Auditing
+Maps:
+ -
+ Property: UserName
+ PropertyValue: "%domain%\\%user% (%sid%)"
+ Values:
+ -
+ Name: domain
+ Value: "/Event/EventData/Data[@Name=\"SubjectDomainName\"]"
+ -
+ Name: user
+ Value: "/Event/EventData/Data[@Name=\"SubjectUserName\"]"
+ -
+ Name: sid
+ Value: "/Event/EventData/Data[@Name=\"SubjectUserSid\"]"
+ -
+ Property: PayloadData1
+ PropertyValue: "Target: %TargetDomainName%\\%TargetUserName%"
+ Values:
+ -
+ Name: TargetUserName
+ Value: "/Event/EventData/Data[@Name=\"TargetUserName\"]"
+ -
+ Name: TargetDomainName
+ Value: "/Event/EventData/Data[@Name=\"TargetDomainName\"]"
+ -
+ Property: PayloadData2
+ PropertyValue: "SubjectLogonId: %SubjectLogonId%"
+ Values:
+ -
+ Name: SubjectLogonId
+ Value: "/Event/EventData/Data[@Name=\"SubjectLogonId\"]"
+
+# Documentation:
+# https://www.ultimatewindowssecurity.com/securitylog/encyclopedia/event.aspx?eventid=4782
+# https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4782
+#
+# Example Event Data:
+#
+#
+#
+#
+# 4782
+# 0
+# 0
+# 13829
+# 0
+# 0x8020000000000000
+#
+# 174829
+#
+#
+# Security
+# DC01.contoso.local
+#
+#
+#
+# Andrei
+# CONTOSO
+# S-1-5-18
+# DC01$
+# CONTOSO
+# 0x3e7
+#
+#
diff --git a/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4793.map b/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4793.map
new file mode 100644
index 00000000..82eab0d8
--- /dev/null
+++ b/evtx/Maps/Security_Microsoft-Windows-Security-Auditing_4793.map
@@ -0,0 +1,80 @@
+Author: Andrew Rathbun
+Description: The Password Policy Checking API was called
+EventId: 4793
+Channel: Security
+Provider: Microsoft-Windows-Security-Auditing
+Maps:
+ -
+ Property: UserName
+ PropertyValue: "%domain%\\%user% (%sid%)"
+ Values:
+ -
+ Name: domain
+ Value: "/Event/EventData/Data[@Name=\"SubjectDomainName\"]"
+ -
+ Name: user
+ Value: "/Event/EventData/Data[@Name=\"SubjectUserName\"]"
+ -
+ Name: sid
+ Value: "/Event/EventData/Data[@Name=\"SubjectUserSid\"]"
+ -
+ Property: PayloadData1
+ PropertyValue: "Target: %TargetUserName%"
+ Values:
+ -
+ Name: TargetUserName
+ Value: "/Event/EventData/Data[@Name=\"TargetUserName\"]"
+ -
+ Property: PayloadData2
+ PropertyValue: "Workstation: %Workstation%"
+ Values:
+ -
+ Name: Workstation
+ Value: "/Event/EventData/Data[@Name=\"Workstation\"]"
+ -
+ Property: PayloadData3
+ PropertyValue: "Status: %Status%"
+ Values:
+ -
+ Name: Status
+ Value: "/Event/EventData/Data[@Name=\"Status\"]"
+ -
+ Property: PayloadData4
+ PropertyValue: "SubjectLogonId: %SubjectLogonId%"
+ Values:
+ -
+ Name: SubjectLogonId
+ Value: "/Event/EventData/Data[@Name=\"SubjectLogonId\"]"
+
+# Documentation:
+# https://www.ultimatewindowssecurity.com/securitylog/encyclopedia/event.aspx?eventid=4793
+# https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4793
+#
+# Example Event Data:
+#
+#
+#
+# 4793
+# 0
+# 0
+# 13829
+# 0
+# 0x8020000000000000
+#
+# 172342
+#
+#
+# Security
+# DC01.contoso.local
+#
+#
+#
+# S-1-5-21-3457937927-2839227994-823803824-1104
+# dadmin
+# CONTOSO
+# 0x36f67
+# DC01
+# -
+# 0x0
+#
+#
diff --git a/evtx/Maps/System_Service-Control-Manager_7036.map b/evtx/Maps/System_Service-Control-Manager_7036.map
index 220929ad..e13208d6 100644
--- a/evtx/Maps/System_Service-Control-Manager_7036.map
+++ b/evtx/Maps/System_Service-Control-Manager_7036.map
@@ -6,7 +6,7 @@ Provider: Service Control Manager
Maps:
-
Property: PayloadData1
- PropertyValue: "Name: %ServiceName%%ServiceName2%" #This is a special case in that data may exist in several forms. Here we look for both and use the one we find. =)
+ PropertyValue: "Name: %ServiceName% | %ServiceName2%" #This is a special case in that data may exist in several forms. Here we look for both and use the one we find. =)
Values:
-
Name: ServiceName