Pre-release changes to API