Add to Watchlist for Account in Salesforce Lightning

We're looking to implement the 'Add to Watchlist' button for Accounts within Salesforce. I found this thread where a workaround was implemented for Leads and Contacts, but it doesn't seem to work for Accounts due to the reference to contactType. Has anyone found a solution for this?

@Sanford Whiteman‌ I saw you contributed on the original thread, perhaps you have some ideas for Accounts too?