Change from storing/sending Entities to EntIndex