Updated the core to work with the 1t1-commons-eid fork