Changes in trigger accessors to have more generic functions