Updated ROS grammar and visitor