Updated handling of attributes and namespace
Updated handling of namespaces and helpers