re applyed changes for new download package support