Tweaked dbupload