Changed name of actionListener to ActionHandler