Support namespaces in Addendums' raw mode