Handle different namespace better