Updated to support new action API.