Improve detail messages
Command line scanner