Further config work