added cfg support