Made changes to support new download package