Added more methods to search for tokens