SCHEMA-50. API updates.
over-the-shoulder review: Lee Sheng