Improved the ordering of the fields (columns)