Add namespace now or in a separate issue?