Added uploader (not debugged yet)