Metrics update

For https://github.com/theodi/shared/issues/180 and https://github.com/theodi/shared/issues/168