Changed uploader format and integrated with the main application