- changed namespace parsing