Added sorting options etc