Add toggle selection support