Added option to disable auto duration