Completely changed structure of HashMap2
Added class KeyValuePair