Added Uploader class