merge Tpex DI branch and add paramters to config