Update schema, remove debug pprint