Added redefine-action for easier message handling