Work on FI-WARE deliverable