Some business logic enhancements for contact tracing (WIP)