Improved the schema loading code.