Fixing schema due to refactoring