Moving to newer version of the api and added support for timeouts