Revised contact tracing data model (one-to-one not practical)