extended AIM with Annotation instrumentation

Change-Id: I6df6f805a3e5c6c80d36a5cb1923e12df12a841f
Signed-off-by: Alexander Wert <alexander.wert@sap.com>