ObjectWrapper replaced by Wapper<T>
MetricValue replaced with Wrapper<T>