Add MessageRate support