Refactored to support datepicker and progress file
Refactored to support datepicker and progress file