Added even more support for action sharing