NDMS workmaps commit 2