Update location of HashMap
Replace deprecated call to `find`