Added results map and command-line path processing.