Fixed support for <attr> and <assign> tags