Added missing parameters and partial (untested) license mapping
implementation