Improve licensing