Improved loading of curriculum