Supporting new annotations API.
Merge branch 'free-annotations'