Refactor Configuration to avoid crazy recursion.