Merge "added annotations for api's"