Significant changes to API.