Added license handler