Add a POI while running

I am participating in a Spartan Obstacle Course race this weekend and would like the obstacles to appear on the map when I upload my race data.  I would also like to be able to change the name of the POI to the actual obstacle name in the app after it’s uploaded.  Is there currently a way to do this?  If not, is this something Garmin is planning to add?