Reverted back to map elements having only IDs (the develop branch was in a state of mixed change to only IDs!).