Tweaking annotations API