Added TokenUtils and Util class