More refactoring of the datetime wtf field