Adding null sorting and label generation things