Make fpf more dynamic