API changes based on feedback