Added namespacing capabilities.