Additional work on API definition.