Changes:

Multiple improvements for licensing logic