Changes in analytics to use pre computed tables