Need to migrate this to getByToken