added more config support