Improvements to documentation annotations for API v2