Added option to disable extended mode