Add support for configuration