Token JSON parsing added