Added some more dc tag handling