Added support for custom config