Improve how we fetch config