Added support for extra cfg values