Add environment field to FileInfo so we can process external files
fix javadocs