Adding support for solution and edit uploads