Modified framework to use HadConfig