Added support for upload and download