SCHEMA-143. Update to reflect new API.