Added some Calculated Metrics