Added action handling