HashMap structure used instead of list for Data.
Unit Test introduced.