updated apis for more flexiblity to configure waiting/isolating