refactor-> add new schema