Added support for global configuration