Added Type and Point to Scan