Changed the schema load process