Added support for global settings