Adding changes for trigger-entity relations.