Full support for 2.16.x API's

Server does not yet return successful results