Prepare for the new TPC layout