Changes to allow for ordering by column names