Added EntityData encoding