Modifications after the feedback of Philipp Cimiano for the deliverable D2.1.1