Initial config refactor