Minor improvement in load time
borken
USing entries but slower
Minor improvement in matching performance