Re-instated the map checking given a more robust approach for matching the contents.