Updates for FPIM

Updates for FPIM