Add a but better licence handling.