Add support for order-by in datasources