Update api to metric
Merge branch 'feature/metric' into develop