Improved Kstat Infrastructure