Added entries to "entityMap" with helper function