Simplify partial handling on actions