Add waitCloseTimeout option