PAFI integration changes