Added functionality to triggers