Merge pull request #1 from eligoenergy/field_enhancement

Field enhancement
Merge pull request #2 from eligoenergy/field_enhancement

Field enhancement
Changing field formats to DT/TM