Added support for @p to command actions