Right, but backward compatibility is a bear; so, perhaps this is what we need for now. Although it may be clearer to use locator.course_id to make it clear that the info is not really additional.