Use token instead of id for now