Improved schema loading #3