Make first change to support a hashed data structure to improve searching.