Added more configuration smarts