Fixed namespace inclusion