Refactored getFieldOrder