Better support for new and modified configs