Add waitUntilActive() method