Refactoring datepicker extension, data fields