This deliverable is an updated version of D2.1.