Adding Selection Tracking Component