Updates to HCMP