Move more code into initializer in Upload