Changes to Upload module