Add option to disable the default autocmd