Metadata support for old and new schemas, and API changes.