Improved loading schema with include