modified methods to dynamically take dataset in download