Simplify selection tracking component