Moved creation of searchable hash here