Added option to disable security