Add proper DTEND support