Made the FIP scalable