adjust to hash generator refactoring