Updates for new ntuples