Added schema field ordering