Namespaces fix for data-context