Updated DTL with names