Add basic wait conditions