user-config refactor