diff --git a/bemade_fsm/data/fsm_data.xml b/bemade_fsm/data/fsm_data.xml
index de3bb89..847a824 100644
--- a/bemade_fsm/data/fsm_data.xml
+++ b/bemade_fsm/data/fsm_data.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
+        <record id="planning_project_stage_waiting_parts" model="project.task.type">
+            <field name="sequence">2</field>
+            <field name="name">Waiting on Parts</field>
+            <field name="legend_blocked">Blocked</field>
+            <field name="fold" eval="False"/>
+            <field name="is_closed" eval="False"/>
+        </record>
         <record id="planning_project_stage_work_completed" model="project.task.type">
             <field name="sequence">15</field>
             <field name="name">Work Executed</field>
@@ -8,6 +15,13 @@
             <field name="fold" eval="False"/>
             <field name="is_closed" eval="False"/>
         </record>
+        <record id="planning_project_stage_exception" model="project.task.type">
+            <field name="sequence">19</field>
+            <field name="name">Exception</field>
+            <field name="legend_blocked">Blocked</field>
+            <field name="fold" eval="False"/>
+            <field name="is_closed" eval="False"/>
+        </record>
         <!-- Since the Field Service project has no_update="1" we use a workaround here -->
         <function model="ir.model.data" name="write">
             <function name="search" model="ir.model.data">
diff --git a/bemade_fsm/models/equipment.py b/bemade_fsm/models/equipment.py
index 4997fed..680d67b 100644
--- a/bemade_fsm/models/equipment.py
+++ b/bemade_fsm/models/equipment.py
@@ -84,3 +84,8 @@ class Equipment(models.Model):
             'res_model': 'bemade_fsm.equipment',
             'type': 'ir.actions.act_window',
         }
+
+    @api.depends('pid_tag', 'name')
+    def _compute_complete_name(self):
+        for rec in self:
+            rec.complete_name = "[%s] %s" % (rec.pid_tag or ' ', rec.name)