Adjust to api sdk specs

Timeout is still not implemented