Making namespaces work better