Update code to implement latest API changes

Described in pull request #236 of the server-side component