Change/improvement to metrics/audit date tracking