MSI: Use a list instead of the custom link structure