#11 Schema Refactoring