minor upgrade to support namespaces