Try to make config less global...