Minor Changes
Reworked DoT templates to remove code redundancy.