Added better table for triggers