Comes now packaged with token input