Updated to reflect state of the API.