Updated cfg file support