fixup! Initial support on Attr support and namespaces