Improve license usage