Refactor of Schema/