updated: metrics api refactor