Modify #1203 Initial support for Attr and namespaces.

#1203