Move stats to own handler