Adds order-by support