getDateTimeFields refactoring