Add selection support