Extracted map storage to HashStore class to prepare for persistant storage