Refactor added schema