Add indexes to support sorting on