add namespacedStrings and unsupportedStmts awareness