SCHEMA-50. updates to API changes to fix build
over-the-shoulder review: Lee Sheng