Add full arguments to *Wait functions
0.6.0