Added support for namespace.