Added NoWait annotation support