Modify licensing to support new individual products