added table token extractor