Updated for token extractors and added their singleton instances