Added support for ordering on multiple columns