Simplify schema maintenance