Re-work the Upload schemas a bit.