Added missing namespaces