First batch of API changes.