Improved Wrap function. Added more types to Scan.