Rewrited to object system - upload management