Added selection support