Add noStack option support