Updated to support the new TPA function in sai