Could you consider adding Conditional Access Polices to the tracking? There have been lots of changes recently, and lots of deprecation.