Adding licensing support