Added new DownloadService and other classes from spike