Big rework on stats augment system