Add support for config.extra