More refactoring to run the recon on the CNAF analysis machine.