Added TokenDictionary and changed parser