Refactor token resolution, add a protocol override.