Fixed upload + some refactoring