Update before changing HashMap to fasten Hash and gen AIs