entities: proper map relationship via proto
0.16.0