Simplification of Trigger System