Added more top-level configs