Improve LicenseManagerImpl implementation