Config class changes