Added code to parse out token items