Preserve some of API for scenario yielded into hooks