scoped modified
Uploader refactoring