Update metric sync

* Use new return structure
* Add categories to metrics