Update to newer (and "lite"r) Metrics