adding support for multiple-tokens and a lookup method