shifted analytics to using site variables