Add optional date/times and fix UUID clean.