How do people handle software assurance in the software licensing part of asset module?

 

Ive just realised that i have both licenses with SA and licenses without. I can see this may cause much pain in the future, Especially when you use SA to upgrade and deploy a newer version of an application.

 

Do you make seperate entries with expiries for the SA software and no expiry for the non SA software?