Update for PHF changes