Update to align output with previous version, added language detection and source.