Enhanced config support