Added handling of multiple actions