Finish new schema