Next version of TnT, with improved meta-data