Added option to disable history