API changes based on feedback from HiDOF