changed to entity map