diff --git a/setup/data/structure/23.triggers.xml b/setup/data/structure/23.triggers.xml
index 06b285828..51ac5676d 100644
--- a/setup/data/structure/23.triggers.xml
+++ b/setup/data/structure/23.triggers.xml
@@ -4,4 +4,14 @@
Incident Creation
bizIncidentTicket
+
+Incident ticket assigned to agent
+bizIncidentTicket
+Assigned
+
+
+Incident ticket resolved
+bizIncidentTicket
+Resolved
+
\ No newline at end of file
diff --git a/setup/data/structure/24.actions.xml b/setup/data/structure/24.actions.xml
index 53563f544..3bd64856b 100644
--- a/setup/data/structure/24.actions.xml
+++ b/setup/data/structure/24.actions.xml
@@ -1,21 +1,63 @@
-
-
-
-Simple eMail
-Default eMail action, tailor it to fit your needs
-
-
-SELECT bizContact AS C WHERE C.id = :this->caller_id
-
-
-New iTop ticket [$this->severity$]: $this->name$, $this->title$
-<h1>A new iTop incident has been created: $this->name$</h1>
+
+
+
+Incident Notification to a Workgroup
+This action informs a team that a ticket has been assigned their workgroup
+
+
+SELECT bizTeam AS t JOIN bizWorkgroup AS w ON w.team_id = t.id WHERE w.id=:this->workgroup_id
+
+
+The ticket $this->name()$, severity $this->severity$ has been assigned to the workgroup $this->workgroup_name$
+<html>
+<body>
+<p>The incident ticket $this->name()$ has been assigned to the workgroup $this->workgroup_name$.</p>
<p>Description: $this->title$</p>
-<p>Initial situation: <pre>$this->initial_situation$</pre></p>
-<p>Ticket Type: $this->type$</p>
-<p>Ticket assigned to: $this->workgroup_name$</p>
+<p>Initial Situation: $this->initial_situation$</p>
<hr/>
-<p>More information: $this->hyperlink()$</p>
-normal
-
-
+<p>for more information on this ticket, click here: $this->hyperlink()$</p>
+</body>
+</html>
+normal
+
+
+Incident notification to Agent
+This action informs an agent that a ticket has been assigned to her/him
+
+
+SELECT bizPerson WHERE id=:this->agent_id
+
+
+The ticket $this->name()$, severity $this->severity$ has been assigned to you
+<html>
+<body>
+<p>The incident ticket $this->name()$ has been assigned to you.</p>
+<p>Description: $this->title$</p>
+<p>Initial Situation: $this->initial_situation$</p>
+<hr/>
+<p>for more information on this ticket, click here: $this->hyperlink()$</p>
+</body>
+</html>
+normal
+
+
+Incident Notification to caller
+This action is used to inform the caller
+
+
+SELECT bizPerson WHERE id=:this->caller_id
+
+
+Ticket $this->name()$, severity $this->severity$ - $this->ticket_status$
+<html>
+<body>
+<p>The incident ticket $this->name()$ has changed to status $this->ticket_status$</p>
+<p>Current situation: $this->current_situation$</p>
+<p>Last update: $this->last_update$</p>
+<hr/>
+<p>for more information on this ticket, click here: $this->hyperlink()$</p>
+</body>
+</html>
+normal
+
+
\ No newline at end of file
diff --git a/setup/data/structure/25.trigger-actions.xml b/setup/data/structure/25.trigger-actions.xml
new file mode 100644
index 000000000..bd58a7d67
--- /dev/null
+++ b/setup/data/structure/25.trigger-actions.xml
@@ -0,0 +1,23 @@
+
+
+
+2
+5
+1
+
+
+3
+5
+2
+
+
+3
+6
+1
+
+
+4
+2
+1
+
+
\ No newline at end of file