PIM-2948: Add ee hooks