Update to read direct from source files.