Added ability to use external config