Additional information reporting, more flexible uploads
Imports cleanup