Added a new entity index in order to be able to do fast lookups of UUIDs