Improving licenses management