Make wait mechanism usble by more cyclades methods