Extend download application

In Progress