Added selection highlighting