Added back missing namespaces.