diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 59e2bc2b523..064e3fc007b 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -151,7 +151,7 @@
             <field name="name">Mail Group Following</field>
             <field name="description">Follow mail.channels to receive news</field>
             <field name="computation_mode">python</field>
-            <field name="compute_code">result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', 'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)], count=True, context=context)</field>
+            <field name="compute_code">result = env['mail.followers'].search_count([('res_model', '=', 'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)])</field>
             <field name="action_id" eval="ref('mail.mail_channel_action_view')" />
         </record>
 
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 19d81c4cbde..74b187f153d 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -270,12 +270,9 @@ class Goal(models.Model):
                 for goal in goals:
                     # execute the chosen method
                     cxt = {
-                        'self': self.pool['gamification.goal'],
                         'object': goal,
-                        'pool': self.pool,
-                        'cr': self.env.cr,
-                        'context': dict(self.env.context), # copy context to prevent side-effects of eval
-                        'uid': self.env.uid,
+                        'env': self.env,
+
                         'date': date,
                         'datetime': datetime,
                         'timedelta': timedelta,
diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml
index 6d32914743e..4df3a54abf0 100644
--- a/addons/gamification/views/goal.xml
+++ b/addons/gamification/views/goal.xml
@@ -247,7 +247,7 @@
                                 attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}"/>
                             <field name="field_date_id" class="oe_inline" attrs="{'invisible':[('computation_mode','not in',('sum', 'count'))]}"/>
                             <field name="domain" attrs="{'invisible':[('computation_mode','not in',('sum', 'count'))], 'required':[('computation_mode','in',('sum', 'count'))]}" class="oe_inline"/>
-                            <field name="compute_code" attrs="{'invisible':[('computation_mode','!=','python')], 'required':[('computation_mode','=','python')]}" placeholder="e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', 'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)], count=True, context=context)"/>
+                            <field name="compute_code" attrs="{'invisible':[('computation_mode','!=','python')], 'required':[('computation_mode','=','python')]}" placeholder="e.g. result = env['mail.followers'].search_count([('res_model', '=', 'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)])"/>
                             <field name="condition" widget="radio"/>
                         </group>
                         <group string="Optimisation" attrs="{'invisible': [('computation_mode', '!=', 'count')]}">