Add MainWithScanner