Make trigger definition consistent