Adds token resolve