Better PEDIA/Namespaces