Fixed - Metrics now working