Refactored ScannerService methods