Rework hash helpers