Updates for TriMatch package