Changes to allow integration with new TREx framework