A lot of additions, including datepicker and timepicker