Updated picker and downloader