Added more sorting fields