Use tokens instead of id numbers