Merge "Added annotations to the API"