Api improvements and changes in toy form