Moved namespace population closer to return