Use new metrics in API

instead of existing company dashboard code