Refactored DatabaseDrivenConfiguration
Refactored DatabaseDrivenConfiguration