Added wrapped metrics