Added Configuration.Default
Refactoring