added support for configuration options