Significantly improve the API.