[TinyMCE] h1..h6 headings with custom class attributes?

In Plone 4 you could configure heading styles like My Style|h2|my-style aka Text|Tag|Class.

The TinyMCE configuration in Plone 5 has a dedicated configuration for headings which only suppots Text|Tag.

Is there a way to give the editor the opportunity to use different variations of headings. We use the functionality currently for group and decorating content groups like this here:

You can add them to the Formats menu using a TinyMCE option as described here: