add one time stub support