Fixed missing namespaces