Updated SimpleTs to TargetSelector

Update 4.21