Added option to disable success message