Added target scanner
Completed targets handling