First implementation of the annotation support