Add sort fields