Added Metric related tables