refactored Schema management