[Cakes] Change data handling and added a temporary special trigger.