Better handling of namespaces.