More changes to support SchemaPayload