API changes and performance boost