Added type namespaces