Add support for custom config options