More namespace code