Make holder classes and stat tracker fully cooperable