I put it there because we might want to replace the HashMap with something else that is quicker. Should I still remove it?