Update 2 - Mapping entity classes.md