HashMap added
Some change