Added parameters to enable and added logging