Use correct registry for basic/extended metrics