refactoring configuration loading
refactoring configuration loading 2