Added additional download logic