Update SH and PCE to support intermediate rates