Add namespace handling while streaming