Adding most of Api* annotations. Tested working.