Added namespace support, with roundtripping of namespaces