Updated the API methods.

There was also an issue with the somewhat confusing dictionary / list
that was returned by the API.