Incorporate Matt's API changes