Added FieldSort macro