Fixed namespaces and email