Added other scan types and else statment for scan call loop