Making Annotation API more consistent with the rest of Model API