Bugfix: Potential multi-threading issue (ConcurrentModificationException) eliminated for ElementMapping classes.