Address comments and move hash fields to dhc_relay struct