refactoring configuration - wip