Rename index.str to entries.str and put everything related to index entries in there.
Properly qualify unique definitions and change lookup to look up unique definitions.
Remove property lookup, not used.