Refactored settings to configuration