Trying again on v1 schema