Improve action handling.