Adding config support realted with issue #12