Revise part5 with new data model (eic:: to eicd:: etc)