Add support for sub configs