Use hash everywhere

Missing commit from PR #17