new schema implemented partially