Updates To Support Epoch Dates, Etc.