Making config less static