Introduce Metrics
Fixed compile errors