Updated schema ordering