Introduce concept of Modifications

Change-Id: I1b69d2bebd7399ca0f6a32f8ff73939853848bf0