Adding wait option