Created a separate component from PhpTokenizer