Added namespace to tags and attributes