Refactor
Remove Config class
Refactor
Refactor
Remove lambda passing for resolving arguments