Change how config is passed in