Bugfix/enhance entity descriptor relationships

Correct some issues identified within the EntityDescrptor model.