Added datepicker and milliseconds conversion