Upload licensing library
Improve suffix handling