I've added token position recording.