Updated Actions and ActionHandler