Added Configuration class
Refactored