Update fix to map
qwerwetrwe
Entity Class

updated
Merge remote-tracking branch 'origin/master' into roland
Not finished -- polymorphism to pointer