diff --git a/mkdocs/docs/field-guide.md b/mkdocs/docs/field-guide.md
index 462fcfeeb4..1b305f5f53 100644
--- a/mkdocs/docs/field-guide.md
+++ b/mkdocs/docs/field-guide.md
@@ -57,7 +57,7 @@ Currency Digits|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|
 Currency Symbol|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
 Currency Symbol Position|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
 Current Date|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
-Custom Properties|✓|✓|✓|✓|✓|✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
+Custom Properties| | | | | | | | |✓| | | | | | | | | | | | | | | 
 Date Format|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
 Date Order|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
 Date Separator|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
@@ -124,7 +124,7 @@ Planned Start| | | | | | | | | | | | | | |✓|✓|✓| | | | |
 Presentation Format| | | | | | | | |✓| | | | | | | | | | | | | | | 
 Preserve Minimum Float When Leveling|✓|✓|✓|✓|✓|✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
 Preserve Scheduled Early and Late Dates|✓|✓|✓|✓|✓|✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
-Project Code Values|✓|✓|✓|✓|✓|✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
+Project Code Values| | | | | | | | | | | | | | |✓|✓|✓| | | | | | | 
 Project Externally Edited| | | | | | | | | | |✓| | | | | | | | | | | | | 
 Project File Path| | | | | | | | |✓| | | | | | | | | | | | | | | 
 Project ID| | | | | | | | | | | | | | |✓|✓|✓| | | | | | | 
@@ -189,7 +189,7 @@ Field|Asta (PP)|ConceptDraw PROJECT (CDP)|Deltek OpenPlan (BK3)|FastTrack (FTS)|
 % Work Complete| | | | | | | |✓|✓|✓|✓| | |✓|✓|✓|✓| | | | | | | 
 ACWP| | | | | | | |✓| | |✓| | | | | | | | | | | | | 
 Active|✓|✓|✓|✓|✓|✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
-Activity Code Values|✓|✓|✓|✓|✓|✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
+Activity Code Values|✓| |✓| | | | | | | | | |✓| |✓|✓|✓| | | | | | | 
 Activity ID|✓| |✓| | | | | | | | |✓|✓| |✓|✓|✓| | |✓| |✓|✓| 
 Activity Percent Complete|✓|✓| |✓|✓|✓| | |✓|✓|✓|✓|✓|✓|✓|✓|✓| | |✓| |✓|✓| 
 Activity Status| | | | | | | | | | | | | | |✓|✓|✓| | | | | | | 
@@ -233,7 +233,7 @@ Effort Driven| | | |✓| | | |✓|✓| |✓| | |✓| | | | |✓| |
 Estimated| | | | | | | |✓|✓| |✓| | | | | | | |✓| | | | | 
 Expanded|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
 Expected Finish| | | | | | | | | | | | | | |✓| |✓| | | | | | | 
-Expense Items|✓|✓|✓|✓|✓|✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
+Expense Items| | | | | | | | | | | | | | |✓|✓|✓| | | | | | | 
 External Early Start| | | | | | | | | | | | | | |✓| |✓| | | | | | | 
 External Late Finish| | | | | | | | | | | | | | |✓| |✓| | | | | | | 
 External Project| | | | | | | | |✓| |✓| | | | | | | | | | | | | 
@@ -328,7 +328,7 @@ Sprint ID| | | | | | | | |✓| | | | | | | | | | | | | | |
 Start|✓|✓|✓|✓|✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
 Start Slack|✓| |✓|✓| | | | |✓|✓|✓|✓|✓| |✓|✓|✓| | |✓|✓|✓| | 
 Start Variance|✓|✓| |✓| | | | |✓|✓|✓| | | |✓|✓|✓| | | | | | | 
-Steps|✓|✓|✓|✓|✓|✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓
+Steps| | | | | | | | | | | | | | |✓|✓|✓| | | | | | | 
 Stop| | | | | | | |✓|✓|✓|✓| | | | | | | | | | | | | 
 Subproject File| | | | | | | |✓|✓| |✓| | | | | | | | | | | | | 
 Subproject GUID| | | | | | | | |✓| | | | | | | | | | | | | | | 
@@ -749,10 +749,10 @@ Remaining Cost| | | | | | | |✓|✓|✓|✓| | | | | | | | | |
 Remaining Overtime Cost| | | | | | | |✓|✓| |✓| | | | | | | | | | | | | 
 Remaining Overtime Work| | | | | | | |✓|✓| |✓| | | | | | | | | | | | | 
 Remaining Work| | | | | | | |✓|✓|✓|✓| | | | | | | | | | | | | 
-Resource Code Values|✓|✓|✓|✓| |✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓| | |✓|✓|✓
+Resource Code Values| | | | | | | | | | | | | | |✓|✓|✓| | | | | | | 
 Resource ID| | |✓| | | | | | | | | | | |✓|✓|✓| | | | | | | 
 Role| | | | | | | | | | | | | | |✓|✓|✓| | | | | | | 
-Role Code Values|✓|✓|✓|✓| |✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓| | |✓|✓|✓
+Role Code Values| | | | | | | | | | | | | | |✓| |✓| | | | | | | 
 SV| | | | | | | | | | |✓| | | | | | | | | | | | | 
 Sequence Number| | | | | | | | | | | | | | |✓|✓|✓| | | | | | | 
 Shift Unique ID| | | | | | | | | | | | | | |✓| |✓| | | | | | | 
@@ -1047,7 +1047,7 @@ Remaining Late Start| | | | | | | | | | | | | | | |✓|✓| | |
 Remaining Overtime Cost| | | | | | | |✓|✓| |✓| | | | | | | | | | | | | 
 Remaining Overtime Work| | | | | | | |✓|✓| |✓| | | | | | | | | | | | | 
 Remaining Work|✓| |✓| | | |✓|✓|✓|✓|✓| | |✓|✓|✓|✓|✓|✓| | | | | 
-Resource Assignment Code Values|✓|✓|✓|✓| |✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓| | |✓|✓|✓
+Resource Assignment Code Values| | | | | | | | | | | | | | |✓| |✓| | | | | | | 
 Resource Request Type| | | | | | | | |✓| | | | | | | | | | | | | | | 
 Resource Unique ID|✓|✓|✓|✓| |✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓|✓| | | |✓|✓|✓
 Response Pending| | | | | | | |✓|✓| | | | | | | | | | | | | | | 
diff --git a/mkdocs/docs/mpp-field-guide.md b/mkdocs/docs/mpp-field-guide.md
index 2053c3d5e5..efe8261395 100644
--- a/mkdocs/docs/mpp-field-guide.md
+++ b/mkdocs/docs/mpp-field-guide.md
@@ -102,7 +102,6 @@ PM Text|✓|✓|✓|✓
 Presentation Format| |✓|✓|✓
 Preserve Minimum Float When Leveling|✓|✓|✓|✓
 Preserve Scheduled Early and Late Dates|✓|✓|✓|✓
-Project Code Values|✓|✓|✓|✓
 Project File Path| |✓|✓|✓
 Project Title|✓|✓|✓|✓
 Relationship Lag Calendar|✓|✓|✓|✓
@@ -149,7 +148,6 @@ Field|MPP8|MPP9|MPP12|MPP14
 % Complete|✓|✓|✓|✓
 % Work Complete|✓|✓|✓|✓
 Active|✓|✓|✓|✓
-Activity Code Values|✓|✓|✓|✓
 Activity Percent Complete|✓|✓|✓|✓
 Actual Cost|✓|✓|✓|✓
 Actual Duration|✓|✓|✓|✓
@@ -182,7 +180,6 @@ Earned Value Method| | |✓|✓
 Effort Driven|✓|✓|✓|✓
 Estimated| |✓|✓|✓
 Expanded|✓|✓|✓|✓
-Expense Items|✓|✓|✓|✓
 External Project| |✓|✓|✓
 External Task| |✓|✓|✓
 Finish|✓|✓|✓|✓
@@ -243,7 +240,6 @@ Sprint ID| | | |✓
 Start|✓|✓|✓|✓
 Start Slack|✓|✓|✓|✓
 Start Variance|✓|✓|✓|✓
-Steps|✓|✓|✓|✓
 Stop|✓|✓|✓|✓
 Subproject File| |✓|✓|✓
 Subproject GUID| | |✓|✓
@@ -649,8 +645,6 @@ Remaining Cost|✓|✓|✓|✓
 Remaining Overtime Cost| |✓|✓|✓
 Remaining Overtime Work| |✓|✓|✓
 Remaining Work|✓|✓|✓|✓
-Resource Code Values|✓|✓|✓|✓
-Role Code Values|✓|✓|✓|✓
 Standard Rate| |✓|✓|✓
 Standard Rate Units| |✓|✓|✓
 Subproject Unique Resource ID| |✓|✓| 
@@ -926,7 +920,6 @@ Remaining Cost| |✓|✓|✓
 Remaining Overtime Cost| |✓|✓|✓
 Remaining Overtime Work| |✓|✓|✓
 Remaining Work|✓|✓|✓|✓
-Resource Assignment Code Values|✓|✓|✓|✓
 Resource Request Type| | |✓|✓
 Resource Unique ID|✓|✓|✓|✓
 Response Pending| |✓|✓|✓
diff --git a/src/main/java/net/sf/mpxj/common/PopulatedFields.java b/src/main/java/net/sf/mpxj/common/PopulatedFields.java
index 127c496a9f..c41f668006 100644
--- a/src/main/java/net/sf/mpxj/common/PopulatedFields.java
+++ b/src/main/java/net/sf/mpxj/common/PopulatedFields.java
@@ -26,6 +26,7 @@
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import net.sf.mpxj.AccrueType;
@@ -116,6 +117,16 @@ private boolean fieldIsNotDefaultValue(Object value, FieldType type)
    {
       boolean result;
 
+      if (value instanceof Collection<?>)
+      {
+         return !((Collection<?>)value).isEmpty();
+      }
+
+      if (value instanceof Map<?,?>)
+      {
+         return !((Map<?,?>)value).isEmpty();
+      }
+
       switch (type.getDataType())
       {
          case STRING: