API changes and better make