Support for new tconfig changes