Updates to address new HPA policies