Licence functionality extended