Started to work on the annotation API