Logs, DataFiles, Improve upload