Added support for downloading