Updated licensing code