More updates in the structure of entityData