Improved license parsing (with support for customer)