Support optional links