More config refactoring -- hierarchy drivers.