Updated API used in tb.