Hardcoded tenant code out
Submessages can also hold key properties in Entity
Merge branch 'master' of github.com:Dexels/navajo