Added support for namespace and key dispatch strategy.