Refactor date fields for Batch
[Closes #12]