Switching from storing/sending Entity to EntIndex