Add support for HJRs and SJRs