Added CalculatedMetrics Table along with CustomerCharts