use new schema