Refactor to keep pace with hashtab change