Better namespace handling