Added cofig support