Added index, sort entries