add support for optional namespaces