Added support for compound actions