FIX: move hash creation to HashKey class
FIX: HashKey class refactoring