Add DTD and use it consistently