Adding ability to specify "wait" property for tasks