Small refactoring includes allowance of user configs