Adapt RunOnce to new functions