New config format