Update to EOI services to include FDW updates

we will leave this open until were ready to merge.