Added HRRN Support