Injecting FPDI now optional