Need to migrate to getByToken