Uploader and parser added