Expanded coverage of the API.