Added sorting and verbose names