Configuration model refactoring.