Added base code for hash handling