Added variables to enable and disable some features