Add support for XML namespaces.
Fix CS.