Feature/refactor hash set