Add order by feature