Adding 'noStack' option support