changes to to make work with metrics-core 3.0