Aravind,Simanta | #502 | Separated download and upload consumers