Reverted global config parameter to being just a boolean
Cleaned up handling of global parameters